From af2b6f4466020dd55aff4e7c8b9ad77522de9904 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 1 Jul 2022 20:51:28 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 529799 -> 530108 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index aae8a10fd63..26f11edb9a5 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -331,6 +331,7 @@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index f43ff396f96f207ef6465458cf838b22c4046a9a..c15c1539c2ff5c5d6457877cc2ab21009ec1a1a6 100644 GIT binary patch delta 203 zcmZo)t*~dULPHB<3sVd878bYq=}DhhM5YTwu?nfGcsYhSdisU91_cDU0!f9;VujM; z%)E4kl8jV^sMMl-g)rag6Hl@TPcJHFQQ%20N-a>(Ed2F~aG6D6dcqbUSD}baWby(d_U#4rEa8mPee~Ek i1<(zce(@@E$n<+HEL`o%jVwUS3dC&Nl^fYprT_r1jzZM{ delta 55 zcmdn9R-t{hLPHB<3sVd878bYq>4}?IlqWARV&C4?z!J_l{WmjPP`h6f3lOscG23>( ICic8307t_VRsaA1 diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 0d5fca58d2c..6bbe1e826e3 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -59,10 +59,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2